From 9df59a932b2e26a81a5fcda790783eaf9393f025 Mon Sep 17 00:00:00 2001
From: Kenichi Handa <handa@m17n.org>
Date: Tue, 26 Sep 2006 04:16:59 +0000
Subject: [PATCH] (Fsingle_key_description): For an invalid char, retuen
 "Invalid char code NNNNN".

---
 src/keymap.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/keymap.c b/src/keymap.c
index 2c6c5ef03c9..9b36ec08b6d 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2385,9 +2385,15 @@ around function keys and event symbols.  */)
       else
 	SPLIT_CHAR (without_bits, charset, c1, c2);
 
-      if (charset
-	  && CHAR_VALID_P (charset, 1)
-	  && ((c1 == 0 && c2 == -1) || c2 == 0))
+      if (! CHAR_VALID_P (without_bits, 1))
+	{
+	  char buf[256];
+
+	  sprintf (buf, "Invalid char code %d", XINT (key));
+	  return build_string (buf);
+	}
+      else if (charset
+	       && ((c1 == 0 && c2 == -1) || c2 == 0))
 	{
 	  /* Handle a generic character.  */
 	  Lisp_Object name;
-- 
2.30.2